Get the foreground color, not the background color.

2005-05-07  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not
        the background color.

diff --git a/ChangeLog b/ChangeLog
index 16b3dac9a958286cd2c44ea634f938b2db6c4ecc..8f088b1729c507d58936b7ba38e4c1d133c9a332 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-07  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not
+       the background color.
+
 2005-05-07  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 16b3dac9a958286cd2c44ea634f938b2db6c4ecc..8f088b1729c507d58936b7ba38e4c1d133c9a332 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-07  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not
+       the background color.
+
 2005-05-07  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 16b3dac9a958286cd2c44ea634f938b2db6c4ecc..8f088b1729c507d58936b7ba38e4c1d133c9a332 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-07  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not
+       the background color.
+
 2005-05-07  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): 

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 8c386938cc0b8e9559bc85a72dc2f01900bcac52..72115eec27118f1c8c2cb88b1a4d7348bd667995 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -1079,7 +1079,7 @@ gc_get_foreground (GdkGC    *gc,
   color->pixel = priv->bg_pixel;
 
   if (gc->colormap)
-    gdk_colormap_query_color (gc->colormap, priv->bg_pixel, color);
+    gdk_colormap_query_color (gc->colormap, priv->fg_pixel, color);
   else
     g_warning ("No colormap in gc_get_background");
 }